merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 27 Dec 2011 07:29:06 +0000 (16:29 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 27 Dec 2011 07:29:06 +0000 (16:29 +0900)
commitac0c42c328b49617048391ee47a476fba6ad5920
tree80ba9113cab50f1e467f69699fc28ffeb03bf811
parent7d77cd972775978cd7dcf527a70cac3f24151297
parentf8bd4eca163b125a133ac05891a480c720cc9fa2
merge trunk